add todo
remove check for context property (reported by operheim1)