hmtb-666 Another contribution

@brettboe can you please review this change for me ?

Thanks :smile: