Fix #452