I wanted a somewhat proper fix for all of this