Dirty fix still needs polishing