Fixes: #2841 Fix the systemSelect situation