Fix server handler