Fixing ciruclar import