Fix #416