Temporary fix for ZF1/ZF2 incompatibility