quick fix the previous quick fix

the previous quick fix was buggy... Sorry...
Working well now!