#249 fixed