Merge pull request #1878 from nnnick/fix/1871

Don't try to use undefined Scale constructors