Fixing steal reference. Closes #41