Bug Fixing 2nd Time :)