fixes for 62318