Fixes #194 and fixes #193.