bug#1 fix