Resolve issue #390 against master.

Not tested.

How can I test this?