Bugfix: allways use correct App