Backport recently played fix