Fix for DB error due to an ambiguous ID.