fixed issues bug