Remove FIXME as already fixed