Fixing #188