Issue214 6.4

Smaller pull request as discussed.