fixing return value matching