Fix #528. (And actually fix it.)