Fix for last part of #380