workaround for shard error added