Adjusted for version 1.2