Fix for issue reported in CONTRIB-5062