Feedback from pull #512