issue #22, standardize