ST2 backwards compatibility #22