Fix for issue #33