Fix for playlist