fixes for 1300