Fixed #499