Fix #2684