added TODO and removed useless cast