This might take care of the issue of double paying