Update #467 based on feedback

Closes #467
Won't this cause errors on shader versions below 1.3 though?