mantis #48 + revision mantis #37