removed last fix as it was buggy