Fixed issue with observer