server: follow-up cluster fix