partial fix #1199