Fix for RTGOV-323
Merge pull request #16 from knrc/RTGOV-323

Fix for RTGOV-323