Fixing #1620