Resolve bug#2