Resolved #71