Fix bug #167