bug fixes
merge fix