Fixing bug D-01214