Fixed bug with `add-property` and block mixin. Closes #1734