Merge fix for #109 from v2.0 branch