Update 30417 1 

Change a couple of lines based on @Lemings pr