Fix bug#36