Fixed #454