WAHGMP fixed