Fix bug #58.