Fix for sync from android devices