The FIXME P9 now seems fixed