changed type promotion check stuff as per forum post