Issue 365

Tested in FF and Chromium