Add only option and bug fix