make n2o_sample working with n2o master