Add the other ones, bug fix.