Remove hack and solve the overridden When case more gracefully