fixes for 41