Resolved #43