Resolved Bug #1