Resolved #3