Possible fix for #150 issue