Working to fix for 2.3.7