@jfirebaugh is right. Closes #811