fixes for 331 and 341