some doubled code (probably harmless, but maybe not...)