Proposed fix, noted issue with test case assertion and modified as necessary