bugfix + Observable