RW: fixing the previous changes