Fixed: for new observer