converted fix for issue #485