I was wrong. Added new commit to apply Daniel's changes.