fixed for 3.4