PARANAMER-25 - fix scope