implement #137 serverside