Merge change from @vyper in #629.