Fix #1515