For #1245