improve the return type detection for exhibit block