Was checking in the wrong opts dict for the master tops, Fix #4035