Adding fix working scenario