Fix bugs with GP41
Minor fix