Start 1.13 fix

Signed-off-by: Ajax Chai <ajaxchai@gmail.com>