Redid previous fix