Fixes the PR for #3 without any merging