Fixed bugs with Modes for DiPoi