converted fix for #485