Fix to new play functionality