Fix #2729