cleaner build of same bugfix