Fix issue #2 (I hope)