Small Bug Fixing..