Fixing #61