Fix bug#35