issue_443_fix