Fixed having too many casts