Unbreak things (silly mistake in last commit, remove *2.0 factor which just can't be right)