Fixing the condits...