Fix #447