fixed bugs
merge fix