Fix fatal error after last fix
CS fixes