Fixing Chaining ONBUILD