Messy, temporary tweak