fixes #652 advanced app fixes
fixes #651