fix #22 in back end