Fix compatibilty with old projects (2)