Fix for Composite Primary Keys