Observer fix