Had to correct the variables passed

Sorry for the turbo commits. Testing time.