Updated to work with 7.12.2