Remove type check here too