Minor changes; Still unable to fix the bug