Fix after server-side refactoring