this fixes #380