ROO-3288 fix
Merge pull request #66 from tstephen/ROO-3288

ROO-3288 fix