Fixed #495