fixed #6642 in trunk as well, sorry i really didn't want to copy this issue ... grrrr