fixing the urgent bug in master