Resolved #74