Fix attempt for #630.
Better fix.

see #630