fix for 1.8