One more! Closes #77