added fixes on consumer