Merge pull request #461 from slava-sh/patch-1

Put `everything-else` before `render`