Work-around for #371