Another dirty fix