fix asserts
Merge pull request #3406 from devoncarew/devoncarew_asserts

fix asserts