minor bug fixing, not polluting common namespace