fixed incompatibility with main_app