Fixed definition order.  Now working.