stay compatible with 3.12.1