Probably finalize Github issue 94 fix