Changed @vierbergenlars' headers
Bugfix