fixed observable issues