Resolved #52