This fixes should be in trunk as well