Bugfix - object returned instead of primitive string
Fixed some additional context-binding issues