removed this TODO as bug is WONTFIX