Fixes lag-inducing issue