Fixed bad merge w/ Activity