Fixing a possible circular import