Mothgomery bug fixed