fixed pre-3.1 compat mode