Fix for PR 2738