resolved by 7559dbaad2beae76231bef6ac0c8794c1fcf4b73
resolved a todo test (but not sure when it was resolved)