Created attachment 102565 [details] [review] better patch This version handles the no modes case properly.