Final Bug fixed

Check if the problem still occurs or not..