#253, moved options cloning to occur before handler assignment