First solution to Mantis issue #101