Second solution to Mantis issue #101