Remove FIXME comment, code is working