Workaround for duplicate key errors