Found issue from previous commit, adding TODO till have time to resolve.