Bug fix for https://twitter.com/wannabe53/status/303851881753624577