Fixed the bug..