Better handle special episodes