Fix bug #59.
Fix bug #58.