fixed for 5.4.16