fix copy'n'paste bugs