Lame little fix in case of lazy consumer code