fix, the code was totally wrong again