fix: correct observable mapping