v2.5 Resolved #543