Fixes github pull request #34 for V7 version