Bug Fixed. Thanks test data from Mr.Q.