Fix observer loop