synchronize with backend and bug fix