Fixes #380