Fixing this years-old mix-up...