Added fix to TODO