follow suggestions in 5563
Applied patch by Marko Kastellic - refs #5563