Ensuring compatibility with 1.3.2