hopefully closed #485