Fix bug #16.