Feature 1295 by pjohans: fixed copy/paste thingie