Quick and Dirty Fix