Adresses Issue #380.