Removed FIXME, already fixed in subscription model.