Resolved #6