Fix #453