Fixing strange bug on 34551