Fixed #455