fixed bug for issue1