fixes for 3.15.3
adapted