Bugfix: moved wrapper code into buildfile while it belongs