fixed bugs issues