fixed duplicate and incorrect Activity bug.