GT-ERR-01 fixes once again