Fix issue with short syncs