Possibly fixing #61