Fix for 3.4