Fix for issue #23

cc #23