fixed some assertions