Fix bug #28