Fix #1537