fixed for 1.8