fix for issue #33