checked #305
fixed #304