Apply changes in
https://github.com/thbishop/fission/commit/a8fe3857e87c7eac4217dc44aeb85e2a5140944c