Resolved #1838