Fixing #57