ERP Bug fix 29082014