Applied patch from OZ for fixing dependency issue