UP: Removed TODO since issue on github was added