After seeing the same flaw in #196, forgot that my patch fails here as well, this approach seems way better :)