Dirty but working fix