Fixed #485