Added (hopefully) fixed generalization