Fixing #1624