Version v1.3.6
Fixed issue 35