Update changes with latest fix