Fixing import see BT#8826