fix for issues #49