Fixed #66 (previous fix was incomplete)

Thanks for reporting