Bug fix, 3 system test pass