Bug fixed
Merge fix