applied openrov/software#320