Updated for 1.8.

Credits go to @cindyker.