This commit fixed bugs