fixes for 4.1.17 and 4.1.24