Possibly fix a bug