Fix bug #16