V130 merge #88 fix