Even more aggressive checking