Better workaround for the known issue about missing commits