dev 2
fix bug