Bugfix to frontend_main