Make the goto variable feature work again