Fix #1229