Attempt #2 - Fix 1.2 multies (issue #265)