Fix for issues #2