Fix the bug which shuffled tracks when one was removed. Please test.