bug_950, patch 1