Bug Fixing..