Fixed #452