Fixing #119