updated for version 3.12.1