further None fix