Fixed incompatibility with 1.6 export