Resolved issues #2