Fix the render_labels logic

Don't know what I was thinking with the render labels
logic. I think I got confused!
Merge pull request #410 from patricksnape/render_labels_fix

Fix the render_labels logic