First try
Fix asserts