Remove casting make things more better, right?