fix bug due to app refactor