Is this required here?
@smuzaffar @ktf 
Will this work properly on all architecture that we support?