Fixed #482