Fixed BUG - 400294