Properly define RandomSwitch random boundaries, close #1688