Fix #2712