some fixes while consuming