added temporary workaround for svr bug w/r/t binscontour
fixed merge conflict