fixed #587
fixed #587