Fix #1501