fixed pull request for render fixes

Please use this pull request instead of previous.