Lame-ish fix