Wait for tkirbys patch