fix #2234