Merge anchor fix from @dontcallmedom