Fix sent from Peter Waltman.