Fixing #669