Fixed Issue With Wrong Types