Bug Fix, 500 cases passed