fixed issue #485