Resolve MUWM-2286
Merge pull request #39 from uw-it-aca/bug/muwm-2286

Resolve MUWM-2286