closes #526