fixing return