Experimental fix (OMS-582)
Final fix (OMS-582)
Merge pull request #130 from opennode/oms-582

Oms 582