#61 fixed