Make pandaxs a little more pedantic