Moved things around to fix issue #16.