Fixed Change Type Bug