Fixed #489