merge fix of issue#38