Path tap fix

New pull request with memory fix to develop.