fixes #3407 fixes #3412