Merged bug fixed