Fixed bug#1