app-bugfix + avoid errors when building