Fixed 3.2 compat