Bug fix bugid#8