Fix #9, #10: Cloning of input corrected