Try to fix interaction with composite-primary-keys