bugfix + regression test
changes