Fix #499 - Regression from 810a2fbc.