fix by-id