Add backward compatibility for PS 1.6