Fix for conda 3.4 changes