Fix widget render. Close #60