Addresses main concern of #891, but not everything