adding a todo so we don't forget to resolve this issue