* Fixing return type parsing