Resolved #7