Move the hack to the place where it'll be actually used