Messed up with the merge, fixing the issue :-)