Chrome issue fixed.

see #585