Possibly fix bug