should be properly updated for 7.1.2, currently untested