fix declarative to work after broken refactor