Finish a TODO, yeah!

Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>