Fix rendering bug
43 files changed