fixed #485