Fix bug #17