Fix for bug #638

Funny no one hit this bug in ... a very long time.