Remove line 671, I think it is very confusing