Fixed up commit #2223