Minor update to restore mobile support, previous commit not useful for mobile support