#79 fixed