patched away faulty checks and replacements