Observable fix