Fix issue #1 (thanks oakley808!)