Fixes: #2840 Fix the systemSelect situation