* apply comments from bjorn from pull request discussion #506