Implemented the proposed changes in #1545