Bug fix:2539