Fix for issues #7