Reverting to what I think should be correct...