additional fix for by-id order