* fixed bugs