Fix for 9.2.2