changed to be more correct currect behaviour