making a single patch instead of three separate ones on issue #1