Fixed to fit PEACH test cases