Warning fix for 639