Resolved #2