fix system-id injection