Fixed #468