#269 fixed