fixed copy/pase problems