Fixed assertions...