fix for issues #31 and #33