fix @matzew's erroneous merge