removed strange returns