Changes for PR 150