Merge Bug fix