fix bugs on app side