Fixing #1227