proper build & bugfix