fix somesthing
fix bug