Another fix for that get_or_create duplicate weirdness