bugfix: fixing bug#488