Fix MUWM-2045
Merge pull request #36 from uw-it-aca/muwm-2045

Fix MUWM-2045