fixed chooseNewSource