fix the production bug ticket 110