Fixed crash

Fixed by re-merging app controller with main. Currently investigating
crash further
mistake
Revert "mistake"

This reverts commit 1da6b9d9c9a2b3668b7d50c6e14974d613fa6708.
Revert "Fixed crash"

This reverts commit 3c275ebf57f239ca45e1a42eb4e972ae75c34a9a.