Added a better workaround for the zend api