Fix bug #47