Fix #449