fixed #37 (not tested on server)