mantis issues #168,#169