Fix bug in Edmond. AC 11439