Fix for issue #33

Test and fix for issue #33