observation bugs fixed