Fix issue 5 per Tim Golden.