[chirp_devel] FIx for #5599