Removed tacky clone-hack, use clone().