2.08 merged pull request issue 31