Fix #548