Bug fixes
merge fix