drop the "(non-standard)"