Fixed as discussed in the PR 14