amended fix for MOSYNC-2645