Fixes: #2839 Fix the systemSelect situation