Referencing issue #17 from MPR