Implement feedback by remcogerlich on pull request.