Fix newly introduced FQN issue caused by 313
Merge pull request #2055 from 9rnsr/fix_imports

Fix newly introduced FQN issue caused by 313