Fixed issue #478

Confirmed working on osx 10.10 with latest Chrome canary.