1.2.18 recommit to fix sourcemap