fix #3383 and #3453