Fixing the bug..