Fix #2703
Really fix #2703