Implemented the expected fix