Sorry, forget what I wrote. I thought you already moved the actual wrapper to the measure module.