Fixed a comparison. Should be storing initial types as message types now.