Remove TODO as it works like expected