#247 fixed #249 fixed