minor changes
merge fix