Bug fix
Merge fix