Fixing with the objective of getting the git voodoo magic working