Keep 1.6 compatibility