Fixing #1136