Correction: mostly working. Bug found