Revert back previous fix