adjusted previous fix