[MODCLUSTER-347] optimizing