Fix #356

See #356