Fixed Observer pattern bugs