Work towards a fix for #3.

Working on fixing #3.