Fixed bug#2