another stab at #1305
Merge pull request #1311 from ractivejs/gh-1305-c

another stab at #1305