fixed back-end bugs