Solves Mantis issue 127.