fix for redmine #2635