Fix bug on mantis.
Fix bug on mantis