Compatibility with stock Sapphire 3.1