Fix for chisel 2.0