fixes #652 advanced app fixes