Fixed type-casts