2nd version of the previous fix