One more fix (T3064)