Fixed assertion problems.