Floow-up issue of #600
Floow-up issue of #600