Small tweak.
Initial work on #18