Hack for old version