Alternate fix for #7 reported by @rolleric

Closes #7