Fixing return type