Reverted changed with Asserts