Observer bug fix