Fixes Mantis issue 90.