fixed for namso-01