App: bug fixing