Improving the asserts