Fixing class import see BT#6722