#76 fixed