#647 code

confirm https://github.com/hector-client/hector/issues/647