Removed overly strict asserts