Fix for Mantis Bug #13594