Fix make_application bug