Fix #1407