Fixed serious bug in either or parameters