Fix bug #79