workaround 0.9.8 madness by creating our own madness