Remove Observer fix