Previous bug fix not applied...