RW: fixing my previous fix