Fixing #35