fixed every case.. at least it seems so