Minor follow-up on 640