for https://0xdata.atlassian.net/browse/HEX-608