a small bug fix
Merge branch 'master' into xml_fix