May fix mantis #7133