Second fix for BT#7413