Fixed KeyGenerator not binding the correct variables