Fixes inclusion in main_app