Mihir | Fixing observation mapper undefined bug