update changes to include #1077 fix