some modal fixing