#242 fixed