Fixed assertion violations.