Fix parameter bug, ran test cases, need fix