Bugfix for namm standard