port research fix from UCSF Mobile