fixed bugs 2