Fixed #486