removed TODO (already an github issue)