Fix bug#2