Correct FS#1275 logic.