Hack to greatly improve speed (10x)