Bug with current-property and block mixins. Fixes #1355