starting to fix the bug..