fixed bug Bug #3304
TAO 3.0 - Delivery - Not totally integrated with new design