Buggy observer for activity
 merge '