Fix #2568