Fixed activity.setup issue