Done: https://github.com/warpc/astute/commit/d8fcff635989760b6677aec63e3685e8ad293387