Remove type coercion hack