make more correct behaviour