Fixed Type Erasure Issue