made generic now that spring bug was fixed