fixed bugs issue