Bug fix: Test1 passes