Fixed Part of the Clicking Errors