fixing production bug