First Attempt to fix the bug...