Implemented a strict mode to try to tease out bugs