Fixed incompatibility with newer version of framework-client