implemented #54 on server