(had to fix a few things within this crate, and my PR is still pending there)