Fix #454