Feedback from @wladekb