Closes MPRF-3.
Merge pull request #1 from infostars/bugfix/MPRF-3

Closes MPRF-3.