Fixing #42