bug fix and breaking out asserts