Activity bug fixing 2