FIX for 3.4