#1573 - Correction for the last fix