Fix auto-advance from first song