quick fixed unnecessary casts