Another Bug fixed