Re #6077 Fix problem with applying monitor correction