Changed comment into a TODO for a possible future issue/fix