Fix #457