#339 Fix another case for wrong next playing after swap