made previous bugfix behave a little better