@edward fixed rendering again