Fixes #292. Thanks Mechanical Mind!