Resolved #44