Fix go mapping