Fixing return [ci skip]