Moved the change so as not to conflict with ISSUE_49