fix problems introduced by allValuesFrom and improve use cases