fixed bugs for the last commit