#51 fixed