(Possibly) Fix drawing issue