Fix nil regression