Fix for BISERVER-8981.
Merge pull request #180 from e-cuellar/master

Fix for BISERVER-8981