fix to #485