trying to fix new architecture (again and again and again)