Implemented Mantis issue 156.