UNTESTED: bring ios in line with android